From 729c84c4bf791db177d4295f0e7e5f647eca4659 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 29 Jan 2010 06:45:45 +0000 Subject: [PATCH] x86: Clean up c/s 20844:ca0759a08057 Signed-off-by: Keir Fraser --- xen/arch/x86/irq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 93e64e8c38..1881f39c8f 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1229,16 +1229,16 @@ static irq_guest_action_t *__pirq_guest_unbind( BUG_ON(!(desc->status & IRQ_GUEST)); - if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) ) + action = (irq_guest_action_t *)desc->action; + irq = desc - irq_desc; + + if ( unlikely(action == NULL) ) { dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n", - d->domain_id, pirq); + d->domain_id, pirq); return NULL; } - action = (irq_guest_action_t *)desc->action; - irq = desc - irq_desc; - for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ ) continue; BUG_ON(i == action->nr_guests); @@ -1360,7 +1360,7 @@ static int pirq_guest_force_unbind(struct domain *d, int irq) goto out; action = (irq_guest_action_t *)desc->action; - if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) ) + if ( unlikely(action == NULL) ) { dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n", d->domain_id, irq); -- 2.30.2